Drop use of GDK_DISABLE_DEPRECATED guards in gtk

We now use function attributes for deprecation so the build-breaking
guards are no longer needed.

diff --git a/gtk/gtk.h b/gtk/gtk.h
index fdba38201f62ddfc569d4249f5ce6dda50c93fc0..8ac61c98f6b3263ae4b2322bed1d92f50d566262 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -221,7 +221,6 @@
 #include <gtk/gtkwidgetpath.h>
 #include <gtk/gtkwindow.h>
 
-#ifndef GTK_DISABLE_DEPRECATED
 #include <gtk/deprecated/gtkfontsel.h>
 #include <gtk/deprecated/gtkhandlebox.h>
 #include <gtk/deprecated/gtkhbbox.h>
@@ -240,7 +239,6 @@
 #include <gtk/deprecated/gtkvscale.h>
 #include <gtk/deprecated/gtkvscrollbar.h>
 #include <gtk/deprecated/gtkvseparator.h>
-#endif
 
 #undef __GTK_H_INSIDE__
 

diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index 3851204933cc59d0a9810b77161e3ca43f0e889a..76f76ddda19657a09f0ef1f0e5865562036636dc 100644 (file)
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -156,7 +156,6 @@ void                  gtk_assistant_set_page_title        (GtkAssistant
 const gchar *         gtk_assistant_get_page_title        (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
 
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 GDK_DEPRECATED
 void                  gtk_assistant_set_page_header_image (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
@@ -171,7 +170,6 @@ void                  gtk_assistant_set_page_side_image   (GtkAssistant
 GDK_DEPRECATED
 GdkPixbuf            *gtk_assistant_get_page_side_image   (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
-#endif
 
 void                  gtk_assistant_set_page_complete     (GtkAssistant         *assistant,
                                                            GtkWidget            *page,

diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index 1ac34ef3c96b63bad0e3e3ba406797c183ffc0e5..0ebca6e5cdadcdd126fd6c48357291e15f965b18 100644 (file)
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -180,13 +180,11 @@ void           gtk_binding_entry_remove      (GtkBindingSet       *binding_set,
                                               guint                keyval,
                                               GdkModifierType      modifiers);
 
-#ifndef GTK_DISABLE_DEPRECATED
 GDK_DEPRECATED
 void           gtk_binding_set_add_path      (GtkBindingSet       *binding_set,
                                               GtkPathType          path_type,
                                               const gchar         *path_pattern,
                                               GtkPathPriorityType  priority);
-#endif
 
 G_END_DECLS
 

diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index e6e3108208a3f40c932958cb0f39483a5cff0365..01c2206a40805e21eaf4655d99af629595cc85b9 100644 (file)
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -82,7 +82,6 @@ GtkWidget*     gtk_button_new_with_label    (const gchar    *label);
 GtkWidget*     gtk_button_new_from_stock    (const gchar    *stock_id);
 GtkWidget*     gtk_button_new_with_mnemonic (const gchar    *label);
 void           gtk_button_clicked           (GtkButton      *button);
-#ifndef GTK_DISABLE_DEPRECATED
 GDK_DEPRECATED
 void           gtk_button_pressed           (GtkButton      *button);
 GDK_DEPRECATED
@@ -91,7 +90,6 @@ GDK_DEPRECATED
 void           gtk_button_enter             (GtkButton      *button);
 GDK_DEPRECATED
 void           gtk_button_leave             (GtkButton      *button);
-#endif
 
 void                  gtk_button_set_relief         (GtkButton      *button,
                                                     GtkReliefStyle  newstyle);

diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index d043485748364c1d0c208b8eaff727e40d370129..96e02e3fb4240a693b22aa6f09c4e0e158fe557c 100644 (file)
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -188,7 +188,6 @@ void               gtk_cell_renderer_get_aligned_area               (GtkCellRend
                                                                     const GdkRectangle *cell_area,
                                                                     GdkRectangle       *aligned_area);
 
-#ifndef GTK_DISABLE_DEPRECATED
 GDK_DEPRECATED_FOR(gtk_cell_renderer_get_preferred_size)
 void             gtk_cell_renderer_get_size       (GtkCellRenderer      *cell,
                                                    GtkWidget            *widget,
@@ -197,7 +196,6 @@ void             gtk_cell_renderer_get_size       (GtkCellRenderer      *cell,
                                                    gint                 *y_offset,
                                                    gint                 *width,
                                                    gint                 *height);
-#endif
 void             gtk_cell_renderer_render         (GtkCellRenderer      *cell,
                                                    cairo_t              *cr,
                                                   GtkWidget            *widget,

diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index f4750f3395b96deaaad58835f883c03d22df5b63..b8c5f1818347dd69ec57b11d1d7be00ebb5c269c 100644 (file)
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -86,12 +86,10 @@ gboolean          gtk_cell_view_get_fit_model           (GtkCellView     *cell_v
 void              gtk_cell_view_set_fit_model           (GtkCellView     *cell_view,
                                                          gboolean         fit_model);
 
-#ifndef GTK_DISABLE_DEPRECATED
 GDK_DEPRECATED_FOR(gtk_widget_get_preferred_size)
 gboolean          gtk_cell_view_get_size_of_row         (GtkCellView     *cell_view,
                                                          GtkTreePath     *path,
                                                          GtkRequisition  *requisition);
-#endif
 
 G_END_DECLS
 

diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 2f02a3e0f3d8666ff92329e4ed191bfe377bff65..4100205df7e9c43fea4c07c91c3d5d8529e83074 100644 (file)
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -130,10 +130,6 @@ GtkIconSet* gtk_icon_set_ref             (GtkIconSet      *icon_set);
 void        gtk_icon_set_unref           (GtkIconSet      *icon_set);
 GtkIconSet* gtk_icon_set_copy            (GtkIconSet      *icon_set);
 
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Get one of the icon variants in the set, creating the variant if
- * necessary.
- */
 GDK_DEPRECATED_FOR(gtk_icon_set_render_icon_pixbuf)
 GdkPixbuf*  gtk_icon_set_render_icon     (GtkIconSet      *icon_set,
                                           GtkStyle        *style,
@@ -142,7 +138,6 @@ GdkPixbuf*  gtk_icon_set_render_icon     (GtkIconSet      *icon_set,
                                           GtkIconSize      size,
                                           GtkWidget       *widget,
                                           const gchar     *detail);
-#endif
 
 void           gtk_icon_set_add_source   (GtkIconSet          *icon_set,
                                           const GtkIconSource *source);

diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index ae05d528c7382a5cd5ed7d145fb9e7d4b432da1f..083bf34510c62605c1c08ef93103168fc8af63b0 100644 (file)
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -210,14 +210,12 @@ GdkPixbuf *           gtk_icon_info_load_symbolic_for_context (GtkIconInfo
                                                                GtkStyleContext  *context,
                                                                gboolean         *was_symbolic,
                                                                GError          **error);
-#ifndef GTK_DISABLE_DEPRECATED
 GDK_DEPRECATED_FOR(gtk_icon_info_load_symbol_for_context)
 GdkPixbuf *           gtk_icon_info_load_symbolic_for_style  (GtkIconInfo   *icon_info,
                                                               GtkStyle      *style,
                                                               GtkStateType   state,
                                                               gboolean      *was_symbolic,
                                                               GError       **error);
-#endif
 void                  gtk_icon_info_set_raw_coordinates (GtkIconInfo  *icon_info,
                                                         gboolean      raw_coordinates);
 

diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index 67b0b26fbfd79db6c5483283b10c2e0a00449731..709c35451ca0c4a9bce14a504390964d2b5b2602 100644 (file)
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -94,7 +94,6 @@ void           gtk_layout_get_size        (GtkLayout     *layout,
                                           guint         *width,
                                           guint         *height);
 
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
 GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout     *layout);
 GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
@@ -106,7 +105,6 @@ GDK_DEPRECATED_FOR(gtk_scrollable_set_vadjustment)
 void           gtk_layout_set_vadjustment (GtkLayout     *layout,
                                            GtkAdjustment *adjustment);
 
-#endif
 
 G_END_DECLS
 

diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 13124c1006c9d4ed8d7787e26c2c3dbebac497c9..24ef0c2b3eb12073bfe3abcea6b289017d490d90 100644 (file)
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -104,13 +104,11 @@ void       gtk_menu_item_toggle_size_request  (GtkMenuItem         *menu_item,
                                                gint                *requisition);
 void       gtk_menu_item_toggle_size_allocate (GtkMenuItem         *menu_item,
                                                gint                 allocation);
-#ifndef GTK_DISABLE_DEPRECATED
 GDK_DEPRECATED
 void       gtk_menu_item_set_right_justified  (GtkMenuItem         *menu_item,
                                                gboolean             right_justified);
 GDK_DEPRECATED
 gboolean   gtk_menu_item_get_right_justified  (GtkMenuItem         *menu_item);
-#endif  /* GTK_DISABLE_DEPRECATED */
 void          gtk_menu_item_set_accel_path    (GtkMenuItem         *menu_item,
                                                const gchar         *accel_path);
 const gchar * gtk_menu_item_get_accel_path    (GtkMenuItem    *menu_item);

diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index a025314acc2c8363ff5ca9537983d1de3e5420da..62bd8d1ce3b74bbf8d9e81b9a40d1cfa0e2ecd75 100644 (file)
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -188,10 +188,10 @@ void gtk_text_view_window_to_buffer_coords (GtkTextView       *text_view,
                                             gint              *buffer_x,
                                             gint              *buffer_y);
 
-#ifndef GTK_DISABLE_DEPRECATED
+GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
 GtkAdjustment*   gtk_text_view_get_hadjustment (GtkTextView   *text_view);
+GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
 GtkAdjustment*   gtk_text_view_get_vadjustment (GtkTextView   *text_view);
-#endif
 
 GdkWindow*        gtk_text_view_get_window      (GtkTextView       *text_view,
                                                  GtkTextWindowType  win);

diff --git a/gtk/gtktoolpalette.h b/gtk/gtktoolpalette.h
index a8e3ddeda96893329ba111a5ee796004a1c5ac63..daff957a6458bcabb1153e0ba809c7bde6a1c08d 100644 (file)
--- a/gtk/gtktoolpalette.h
+++ b/gtk/gtktoolpalette.h
@@ -126,13 +126,12 @@ void                           gtk_tool_palette_add_drag_dest         (GtkToolPa
                                                                        GtkToolPaletteDragTargets  targets,
                                                                        GdkDragAction              actions);
 
-#ifndef GTK_DISABLE_DEPRECATED
 
+GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
 GtkAdjustment*                 gtk_tool_palette_get_hadjustment       (GtkToolPalette            *palette);
+GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
 GtkAdjustment*                 gtk_tool_palette_get_vadjustment       (GtkToolPalette            *palette);
 
-#endif
-
 const GtkTargetEntry*          gtk_tool_palette_get_drag_target_item  (void) G_GNUC_CONST;
 const GtkTargetEntry*          gtk_tool_palette_get_drag_target_group (void) G_GNUC_CONST;
 

diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 80aa134af61df143565e60949287b7304d516ae4..527586967ca6f41aa8fef817b073bee4a1466f10 100644 (file)
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -214,16 +214,17 @@ void                   gtk_tree_view_set_model                     (GtkTreeView
                                                                    GtkTreeModel              *model);
 GtkTreeSelection      *gtk_tree_view_get_selection                 (GtkTreeView               *tree_view);
 
-#ifndef GTK_DISABLE_DEPRECATED
-
+GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
 GtkAdjustment         *gtk_tree_view_get_hadjustment               (GtkTreeView               *tree_view);
+GDK_DEPRECATED_FOR(gtk_scrollable_set_hadjustment)
 void                   gtk_tree_view_set_hadjustment               (GtkTreeView               *tree_view,
                                                                    GtkAdjustment             *adjustment);
+GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
 GtkAdjustment         *gtk_tree_view_get_vadjustment               (GtkTreeView               *tree_view);
+GDK_DEPRECATED_FOR(gtk_scrollable_set_vadjustment)
 void                   gtk_tree_view_set_vadjustment               (GtkTreeView               *tree_view,
                                                                    GtkAdjustment             *adjustment);
 
-#endif
 
 gboolean               gtk_tree_view_get_headers_visible           (GtkTreeView               *tree_view);
 void                   gtk_tree_view_set_headers_visible           (GtkTreeView               *tree_view,

diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index 90b804f1a814b2e76fd87593cb2d71cac0e5c662..d07ccccbdb5415c336c1a83c56ae70905703006a 100644 (file)
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -126,11 +126,12 @@ typedef enum {
 
 GType          gtk_ui_manager_get_type            (void) G_GNUC_CONST;
 GtkUIManager  *gtk_ui_manager_new                 (void);
-#ifndef GTK_DISABLE_DEPRECATED
+GDK_DEPRECATED
 void           gtk_ui_manager_set_add_tearoffs    (GtkUIManager          *manager,
-                                                  gboolean               add_tearoffs);
+                                                   gboolean               add_tearoffs);
+GDK_DEPRECATED
 gboolean       gtk_ui_manager_get_add_tearoffs    (GtkUIManager          *manager);
-#endif
+
 void           gtk_ui_manager_insert_action_group (GtkUIManager          *manager,
                                                   GtkActionGroup        *action_group,
                                                   gint                   pos);

diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 686531045556ea8de5a9c9ad20fcf2ad9b411853..68a23f287546ccf1c2ce3d98ec43a9865d5643dd 100644 (file)
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -75,16 +75,16 @@ GType          gtk_viewport_get_type        (void) G_GNUC_CONST;
 GtkWidget*     gtk_viewport_new             (GtkAdjustment *hadjustment,
                                             GtkAdjustment *vadjustment);
 
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-
+GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
 GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport   *viewport);
+GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
 GtkAdjustment* gtk_viewport_get_vadjustment (GtkViewport   *viewport);
+GDK_DEPRECATED_FOR(gtk_scrollable_set_hadjustment)
 void           gtk_viewport_set_hadjustment (GtkViewport   *viewport,
-                                            GtkAdjustment *adjustment);
+                                             GtkAdjustment *adjustment);
+GDK_DEPRECATED_FOR(gtk_scrollable_set_vadjustment)
 void           gtk_viewport_set_vadjustment (GtkViewport   *viewport,
-                                            GtkAdjustment *adjustment);
-
-#endif
+                                             GtkAdjustment *adjustment);
 
 void           gtk_viewport_set_shadow_type (GtkViewport   *viewport,
                                             GtkShadowType  type);

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 387cb0db84cd14e02bb7e1453a32b5c170c1d9c8..76d192ce2c8e11b1962000d419f2a8cb56467be8 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -483,10 +483,9 @@ void          gtk_widget_queue_draw_region   (GtkWidget           *widget,
                                            const cairo_region_t*region);
 void      gtk_widget_queue_resize        (GtkWidget           *widget);
 void      gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
-#ifndef GTK_DISABLE_DEPRECATED
-void      gtk_widget_size_request        (GtkWidget           *widget,
-                                          GtkRequisition      *requisition);
-#endif
+GDK_DEPRECATED_FOR(gtk_widget_get_preferred_size)
+void       gtk_widget_size_request        (GtkWidget           *widget,
+                                           GtkRequisition      *requisition);
 void      gtk_widget_size_allocate       (GtkWidget           *widget,
                                           GtkAllocation       *allocation);
 
@@ -509,10 +508,9 @@ void                gtk_widget_get_preferred_size             (GtkWidget      *w
                                                                GtkRequisition *minimum_size,
                                                                GtkRequisition *natural_size);
 
-#ifndef GTK_DISABLE_DEPRECATED
-void       gtk_widget_get_child_requisition (GtkWidget        *widget,
-                                            GtkRequisition    *requisition);
-#endif
+GDK_DEPRECATED_FOR(gtk_widget_get_preferred_size)
+void       gtk_widget_get_child_requisition (GtkWidget         *widget,
+                                             GtkRequisition    *requisition);
 void      gtk_widget_add_accelerator     (GtkWidget           *widget,
                                           const gchar         *accel_signal,
                                           GtkAccelGroup       *accel_group,